Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 25 May 2010 23:37:05 +0000 (23:37 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 25 May 2010 23:37:05 +0000 (23:37 +0000)

Trivial merge